use PANGO_BREAK_WORD_CHAR instead of PANGO_BREAK_WORD so the text cell

2007-06-12  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkiconview.c (update_text_cell): use PANGO_BREAK_WORD_CHAR
	instead of PANGO_BREAK_WORD so the text cell doesn't overflow the
	wrap-width if there is no whitespace found to break at.
	Fixes bug #446107.

svn path=/trunk/; revision=18112

diff --git a/ChangeLog b/ChangeLog
index 9cc49b83ec7b3290240589674afb786c2f874805..7646d70697e1bd01d1d785aafee540c44da78b3a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-12  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkiconview.c (update_text_cell): use PANGO_BREAK_WORD_CHAR
+       instead of PANGO_BREAK_WORD so the text cell doesn't overflow the
+       wrap-width if there is no whitespace found to break at.
+       Fixes bug #446107.
+
 2007-06-12  Kristian Rietveld  <kris@imendio.com>
 
        Fix #410815, reported by Lucas Rocha.
@@ -93,7 +100,7 @@
 
        * gdk/quartz/gdkdrawable-quartz.c (gdk_quartz_draw_arc): fix
        angles by flipping the coordinate system back to its original y
-       direction. The implementtion is still broken for ellipses, will
+       direction. The implementation is still broken for ellipses, will
        have to simulate them using bezier curves.
 
 2007-06-10  Cody Russell  <bratsche@gnome.org>

diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 65c2a9115352d9bf53d29e3f482c5496f8591516..46db61536395ba133bc3d1acf5ad70171c35eb34 100644 (file)
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -4912,14 +4912,14 @@ update_text_cell (GtkIconView *icon_view)
       if (icon_view->priv->orientation == GTK_ORIENTATION_VERTICAL)
        g_object_set (info->cell,
                       "alignment", PANGO_ALIGN_CENTER,
-                     "wrap-mode", PANGO_WRAP_WORD,
+                     "wrap-mode", PANGO_WRAP_WORD_CHAR,
                      "xalign", 0.0,
                      "yalign", 0.0,
                      NULL);
       else
        g_object_set (info->cell,
                       "alignment", PANGO_ALIGN_LEFT,
-                     "wrap-mode", PANGO_WRAP_WORD,
+                     "wrap-mode", PANGO_WRAP_WORD_CHAR,
                      "xalign", 0.0,
                      "yalign", 0.0,
                      NULL);